Get rid of a few more $wgTitles
authorChad Horohoe <demon@users.mediawiki.org>
Thu, 15 Dec 2011 16:52:51 +0000 (16:52 +0000)
committerChad Horohoe <demon@users.mediawiki.org>
Thu, 15 Dec 2011 16:52:51 +0000 (16:52 +0000)
includes/Wiki.php

index e4e5b30..cc29e34 100644 (file)
@@ -593,11 +593,11 @@ class MediaWiki {
                        return;
                }
 
-               if ( $wgUseFileCache && $wgTitle->getNamespace() >= 0 ) {
+               if ( $wgUseFileCache && $this->getTitle()->getNamespace() >= 0 ) {
                        wfProfileIn( 'main-try-filecache' );
                        if ( HTMLFileCache::useFileCache( $this->context ) ) {
                                /* Try low-level file cache hit */
-                               $cache = HTMLFileCache::newFromTitle( $wgTitle, $action );
+                               $cache = HTMLFileCache::newFromTitle( $this->getTitle(), $action );
                                if ( $cache->isCacheGood( /* Assume up to date */ ) ) {
                                        /* Check incoming headers to see if client has this cached */
                                        $timestamp = $cache->cacheTimestamp();
@@ -605,7 +605,7 @@ class MediaWiki {
                                                $cache->loadFromFileCache( $this->context );
                                        }
                                        # Do any stats increment/watchlist stuff
-                                       $article = WikiPage::factory( $wgTitle );
+                                       $article = WikiPage::factory( $this->getTitle() );
                                        $article->doViewUpdates( $user );
                                        # Tell OutputPage that output is taken care of
                                        $this->context->getOutput()->disable();